Fix misc spelling in MariaDB Server repository

Note! Do not update this patch with new typos, but put them in a new
patch that can be submitted upstream and tracked separately.

* Fix misc typos in MariaDB Server

* Fix spelling of 'allows one to'

  Fix the following Lintian nags introduced in commit
  c8d040938a7ebe10e62506a726702c5990ef4dda:

  X: libmariadbd19t64: spelling-error-in-binary choosen chosen [usr/lib/x86_64-linux-gnu/libmariadbd.so.19]
  X: mariadb-backup: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-backup]
  X: mariadb-backup: spelling-error-in-binary choosen chosen [usr/bin/mariadb-backup]
  X: mariadb-server-core: spelling-error-in-binary "allows to" "allows one to" [usr/sbin/mariadbd]
  X: mariadb-server-core: spelling-error-in-binary choosen chosen [usr/sbin/mariadbd]
  X: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-client-test-embedded]
  X: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/mariadb-test-embedded]
  X: mariadb-test: spelling-error-in-binary "allows to" "allows one to" [usr/bin/test-connect-t]
  X: mariadb-test: spelling-error-in-binary choosen chosen [usr/bin/mariadb-client-test-embedded]
  X: mariadb-test: spelling-error-in-binary choosen chosen [usr/bin/mariadb-test-embedded]
  X: mariadb-test: spelling-error-in-binary choosen chosen [usr/bin/test-connect-t]

Merged in https://github.com/MariaDB/server/commit/5879c85f505d3a11d4b8f479f2437416d8a1d724
and thus included in MariaDB 12.3 onward.

Forwarded: https://github.com/MariaDB/server/pull/4458

Gbp-Pq: Name Fix-misc-spelling-in-MariaDB-Server-repository.patch

diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc
index 22f4dc387dd67166caa7282915c0aac59bd93ee1..cf704fdd930bceda5a7c191ee41e66cb0ca0274c 100644 (file)
--- a/extra/mariabackup/innobackupex.cc
+++ b/extra/mariabackup/innobackupex.cc
@@ -447,7 +447,7 @@ static struct my_option ibx_long_options[] =
        {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
          "This option specifies time in seconds that mariadb-backup should wait for "
          "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all "
-         "currently running queries using explicite LOCK TABLES has ended. "
+         "currently running queries using explicit LOCK TABLES has ended. "
          "If there are still such queries when the timeout expires, mariadb-backup "
          "terminates with an error. Default is 0, in which case mariadb-backup waits "
          "indefinitely for BACKUP STAGE START to finish",

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index dec69a0905ecdee35c351159795489daf9061f8b..b45066fc679ecbb7f1ca0d37bb82d25eb3d146cf 100644 (file)
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1809,7 +1809,7 @@ struct my_option xb_client_options[]= {
     {"startup-wait-timeout", OPT_LOCK_WAIT_TIMEOUT,
      "This option specifies time in seconds that mariadb-backup should wait for "
      "BACKUP STAGE START to complete. BACKUP STAGE START has to wait until all "
-     "currently running queries using explicite LOCK TABLES has ended. "
+     "currently running queries using explicit LOCK TABLES has ended. "
      "If there are still such queries when the timeout expires, mariadb-backup "
      "terminates with an error. Default is 0, in which case mariadb-backup waits "
      "indefinitely for BACKUP STAGE START to finish",
@@ -5868,7 +5868,7 @@ void CorruptedPages::backup_fix_ddl(ds_ctxt *ds_data, ds_ctxt *ds_meta)
        }
 
        /* Mariabackup doesn't detect any FILE_OP for the deferred
-       tablespace. There is a possiblity that page0 could've
+       tablespace. There is a possibility that page0 could've
        been corrupted persistently in the disk */
        for (auto space_name: defer_space_names) {
                if (!check_if_skip_table(space_name.c_str())) {

diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 2c65abf13c3b8c8c09daa2eee6b96e3b928cff4b..6e3a4146f4ac12601a1d86912c42aadb1b9d7597 100644 (file)
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -826,13 +826,14 @@ The following specify which files/extra groups are read (specified before remain
  storage as part of an index scan
  --optimizer-join-limit-pref-ratio=# 
  For queries with JOIN and ORDER BY LIMIT : make the
- optimizer consider a join order that allows to short-cut
- execution after producing #LIMIT matches if that promises
- N times speedup. (A conservative setting here would be is
- a high value, like 100 so the short-cutting plan is used
- if it promises a speedup of 100x or more). Short-cutting
- plans are inherently risky so the default is 0 which
- means do not consider this optimization
+ optimizer consider a join order that allows one to
+ short-cut execution after producing #LIMIT matches if
+ that promises N times speedup. (A conservative setting
+ here would be is a high value, like 100 so the
+ short-cutting plan is used if it promises a speedup of
+ 100x or more). Short-cutting plans are inherently risky
+ so the default is 0 which means do not consider this
+ optimization
  --optimizer-key-compare-cost=# 
  Cost of checking a key against the end key condition
  --optimizer-key-copy-cost=# 

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
index aad92d5848fb7416e2ae2a033982a287bb30048a..ec1e0624f4b0b16208aa95516843385a6b9b585a 100644 (file)
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -2505,7 +2505,7 @@ COMMAND_LINE_ARGUMENT     REQUIRED
 VARIABLE_NAME  OPTIMIZER_JOIN_LIMIT_PREF_RATIO
 VARIABLE_SCOPE SESSION
 VARIABLE_TYPE  BIGINT UNSIGNED
-VARIABLE_COMMENT       For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization
+VARIABLE_COMMENT       For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows one to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization
 NUMERIC_MIN_VALUE      0
 NUMERIC_MAX_VALUE      4294967295
 NUMERIC_BLOCK_SIZE     1

diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
index 11f168d61eea197a53a8b91381029f222a4a11c5..1f37da673104a28d5b5d2ec3a5b2e3046c452ab9 100644 (file)
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@@ -2715,7 +2715,7 @@ COMMAND_LINE_ARGUMENT     REQUIRED
 VARIABLE_NAME  OPTIMIZER_JOIN_LIMIT_PREF_RATIO
 VARIABLE_SCOPE SESSION
 VARIABLE_TYPE  BIGINT UNSIGNED
-VARIABLE_COMMENT       For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization
+VARIABLE_COMMENT       For queries with JOIN and ORDER BY LIMIT : make the optimizer consider a join order that allows one to short-cut execution after producing #LIMIT matches if that promises N times speedup. (A conservative setting here would be is a high value, like 100 so the short-cutting plan is used if it promises a speedup of 100x or more). Short-cutting plans are inherently risky so the default is 0 which means do not consider this optimization
 NUMERIC_MIN_VALUE      0
 NUMERIC_MAX_VALUE      4294967295
 NUMERIC_BLOCK_SIZE     1

diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index ad10ab5b7c09e64e28bf4c398b6d08ac30d866e0..fb6806ab227b195f177fb2d37d183d291d9fa017 100644 (file)
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -6895,7 +6895,7 @@ bool JOIN::choose_subquery_plan(table_map join_tables)
         add("rows", inner_record_count_1).
         add("materialization_cost", materialize_strategy_cost).
         add("in_exist_cost", in_exists_strategy_cost).
-        add("choosen", strategy);
+        add("chosen", strategy);
     }
 
     DBUG_PRINT("info",
@@ -6933,7 +6933,7 @@ bool JOIN::choose_subquery_plan(table_map join_tables)
     {
       Json_writer_object trace_wrapper(thd);
       Json_writer_object trace_subquery(thd, "subquery_plan_revert");
-      trace_subquery.add("choosen", "in_to_exists");
+      trace_subquery.add("chosen", "in_to_exists");
     }
   }
 

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 60f3e45176f6d616b30de42a0f85fb68adc12bb2..5b50f6ffbba5c386075c372282c527cca945b490 100644 (file)
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -11831,7 +11831,7 @@ double recompute_join_cost_with_limit(const JOIN *join, bool skip_sorting,
 
 /*
   @brief
-    Finalize building the join order which allows to short-cut the join
+    Finalize building the join order which allows one to short-cut the join
     execution.
 
   @detail
@@ -15317,7 +15317,7 @@ void JOIN::drop_unused_derived_keys()
       }
       /*
         We dropped all keys except the chosen one and unique keys.
-        The choosen one is stored as the first key (number 0).
+        The chosen one is stored as the first key (number 0).
       */
       tab->ref.key= 0;
     }

diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc
index ad4bb1fe3d6e4aa18e66968ecd2c1acd9a6aa432..e1b5dca29bf16eb54037551708109d1be0a71b5c 100644 (file)
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@@ -2973,7 +2973,7 @@ static Sys_var_ulong Sys_optimizer_selectivity_sampling_limit(
 static Sys_var_ulonglong Sys_optimizer_join_limit_pref_ratio(
        "optimizer_join_limit_pref_ratio",
        "For queries with JOIN and ORDER BY LIMIT : make the optimizer "
-       "consider a join order that allows to short-cut execution after "
+       "consider a join order that allows one to short-cut execution after "
        "producing #LIMIT matches if that promises N times speedup. "
        "(A conservative setting here would be is a high value, like 100 so "
        "the short-cutting plan is used if it promises a speedup of 100x or "

diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index dd8cbd4850ef33c841dbe32c1bf0d96074f0bc90..cc4b86676fb4a4b229e54f4d836122defdbba7c1 100644 (file)
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -194,7 +194,7 @@ su_kill() {
 
 #
 # Read defaults file from 'basedir'.   If there is no defaults file there
-# check if it's in the old (depricated) place (datadir) and read it from there
+# check if it's in the old (deprecated) place (datadir) and read it from there
 #
 
 extra_args=""